fix: Support using pandas nullable types #77
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@AndyBryson thanks for your PR, I will review your changes ASAP |
bednar
requested changes
Mar 18, 2024
There was a problem hiding this comment.
Hi @AndyBryson,
thanks for your PR 👍. Can you please rebase your sources with main branch and satisfy our checklist?
Best
bednar
changed the title
AndyBryson
force-pushed
the
main
branch
2 times, most recently
from
904f39c
to
163cee8
Compare
|
Hi @bednar. That's mostly done. There is no CHANGELOG.md, so I've not updated it. |
bednar
requested changes
Mar 18, 2024
There was a problem hiding this comment.
@AndyBryson I've add the CHANGELOG.md to main branch.
You can add something like:
### Bugfix
1. [#77](https://github.com/InfluxCommunity/influxdb3-python/pull/77): Support using pandas nullable types
bednar
requested changes
Mar 18, 2024
Hopefully that's all done now. |
bednar
requested changes
Apr 2, 2024
Comment on lines
16
to
20
| try: | ||
| from ...extras import pd | ||
|
|
||
| def _not_nan(x): | ||
| return not pd.isna(x) | ||
|
|
||
| except ImportError: | ||
| pd = None | ||
|
|
||
| def _not_nan(x): | ||
| return x == x | ||
|
|
There was a problem hiding this comment.
This can be simplify to because the pandas should be present:
Suggested change
| try: | |
| from ...extras import pd | |
| def _not_nan(x): | |
| return not pd.isna(x) | |
| except ImportError: | |
| pd = None | |
| def _not_nan(x): | |
| return x == x | |
| def _not_nan(x): | |
| from ...extras import pd | |
| return not pd.isna(x) | |
Comment on lines
204
to
208
| if issubclass(value.type, np.integer): | ||
| field_value = f"{sep}{key_format}={{{val_format}}}i" | ||
| elif issubclass(value.type, np.bool_): | ||
| field_value = f'{sep}{key_format}={{{val_format}}}' | ||
| elif issubclass(value.type, np.floating): | ||
| if null_columns.iloc[index]: | ||
| field_value = f"""{{"" if math.isnan({val_format}) else f"{sep}{key_format}={{{val_format}}}"}}""" | ||
| field_value = f"""{{"" if pd.isna({val_format}) else f"{sep}{key_format}={{{val_format}}}i"}}""" | ||
| else: | ||
| field_value = f"{sep}{key_format}={{{val_format}}}i" |
There was a problem hiding this comment.
This can be simplify to:
if issubclass(value.type, np.integer) or issubclass(value.type, np.floating) or issubclass(value.type, np.bool_): # noqa: E501
suffix = 'i' if issubclass(value.type, np.integer) else ''
if null_columns.iloc[index]:
field_value = f"""{{"" if pd.isna({val_format}) else f"{sep}{key_format}={{{val_format}}}{suffix}"}}""" # noqa: E501
else:
field_value = f"{sep}{key_format}={{{val_format}}}{suffix}"Allow nullable types that aren't floats. This means that we can upload data frames that have int/bool columns that have empty cells and still maintain the correct type.
bednar
approved these changes
Apr 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #76
Proposed Changes
Use pandas to decide what is
NaNto allow us to have nullable bools, ints and strings.Profiling
With a real world dataset, 10_000 lines, 156 columns
exiting method, no pandas null
1.86 s ± 26.4 ms per loop (mean ± std. dev. of 7 runs, 1 loop each)
new method, no pandas null
1.7 s ± 103 ms per loop (mean ± std. dev. of 7 runs, 1 loop each)
new method, with pandas null
1.51 s ± 25.3 ms per loop (mean ± std. dev. of 7 runs, 1 loop each)
Checklist